From: Matthias Clasen <mclasen@redhat.com>
Date: Thu, 19 May 2016 13:03:20 +0000 (-0400)
Subject: icon theme: Add a warning
X-Git-Tag: archive/raspbian/3.24.39-1+rpi1~1^2~65^2~39^2~1723
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=de7c15636d44c3c81fbee368c867afdd20740563;p=gtk%2B3.0.git

icon theme: Add a warning

Warn about the situation when we've found a resource or file path,
but gdk-pixbuf fails to give us a pixbuf. This generally means that
either pixbuf loaders are not found or the shared-mime database
is missing.
---

diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index 4cb4893600..8ebf652d4f 100644
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -3951,7 +3951,30 @@ icon_info_ensure_scale_and_pixbuf (GtkIconInfo *icon_info)
     }
 
   if (!source_pixbuf)
-    return FALSE;
+    {
+      static gboolean warn_about_load_failure = TRUE;
+
+      if (warn_about_load_failure)
+        {
+          gchar *path;
+
+          if (icon_info->is_resource)
+            path = g_strdup (icon_info->filename);
+          else if (G_IS_FILE (icon_info->loadable))
+            path = g_file_get_path (G_FILE (icon_info->loadable));
+          else
+            path = g_strdup ("icon theme");
+
+          g_warning ("Could not load a pixbuf from %s.\n"
+                     "This may indicate that pixbuf loaders or the mime database could not be found.",
+                     path);
+          g_free (path);
+
+          warn_about_load_failure = FALSE;
+        }
+
+      return FALSE;
+    }
 
   /* Do scale calculations that depend on the image size
    */